Sanity checks added in query methods 'available' and live?