Pre changes to search elements

Signed-off-by: shaunkrd <shaunkrd@gmail.com>