Bug fix

IdentifierQuery fixed

Also added some better messages to InvalidArgumentException