SQL Code Style Settings

I haven't changed my settings in a long time, hence not sure whether I may have changed unintentionally, or new behaviours have been added that need to be configured.

1. No indentation after a comma

When I write CTES:

WITH test AS (

),

  | <-cursor gets indented, I would prefer for it to go to the back of the line

2. Indentation of whole subquery 

At the same time, when I type closing bracket, the code gets indented. I am sure this wasn't happening before but can't figure out how to change it. Let's say I start with this code:

WITH test AS (
SELECT
  *
FROM table
  INNER JOIN active USING(something_id)
WHERE
  start_date BETWEEN '2022-07-01' AND '2022-07-31'

And after pressing the closing bracket it does the following:

test AS (
          SELECT *
          FROM table
          INNER JOIN active
          USING (something_id)
          WHERE
            start_date BETWEEN '2022-07-01' AND '2022-07-31'
)

If possible I would only like to ident all code as one block

test AS (
  SELECT
    *
  FROM table
    INNER JOIN active USING(something_id)
  WHERE
    start_date BETWEEN '2022-07-01' AND '2022-07-31'
)