Add empty check test to selector