Fixed and added more queries.