[#2022] addition of call to specific query if it is present.