cleanup, adjust search templates, timezone logic change