Fixed a bug that occurs when either argument of query list does not have a value or query list is empty