Fixes for comparing availability within related records