Refactored item availability checks (ubpb/catalog#215)