DATACMND-525 - Add query derivation for additional keywords.

Added support for:
 - NEGATING_SIMPLE_PROPERTY
 - CONTAINING
 - NOT_CONTAINING