added dynamic search