Temporary fix on the queries