added specialized parameters support in queries