Fix for filtered search
Versioning