calendar fix and week search