fix search feature, add both types of constants