(#658) - Force inclusion of conflicts in view querying..