Query class fix and ingredients notice fix

Closes #101 and #102