Change enumerateWithBlock to NSFastEnumeration

Change the way the query is enuemrated over, from enumerateWithBlock to
NSFastEnumeration, enabling the speration of embedded if statements