#528 reorder week days
#528 add guard check