query handler / filse construction modified