Search criteria dynamically #4

Reflected in 1.0.x branch