minor readability improvements, added FIXME
fixed generated SQL for tagged_with :any