Fixed infractions querying
MERGED Joaquins