Fixing the look up of bundle names and allowing "An" or "a" as an amount of 1