query changes
bug fixes