added filtering and specialized queries based on time of day
fixed merge conflicts