Make queries as static strings for improvements