Added bootstrap and class type search option