Fixed and cleaned up query.