TAP query updates

- Fixed runtime queries