improved all methods not to use question marks in queries