Misc bug fixes
Added "query since" but not using it.