add remaining query modifier support