improved time filtering
removed redundant route code