Added more filtering options to unique checker validators

Signed-off-by: Tom Wright <tom@inflatablecookie.com>