Fixed queries, changed some errors to warnings