Availability - use correct start and end times

In the Availability service ensure we are checking the correct start and
end times