Added support for querying using both the current and previous symbol