Fix PGSQL Bugs
Removing parenthesis make query works for MySQL and PgSQL