cleanup eclipse warnings
use search expression framework