Fixed dictionary search
Added argument endpoint support
Filter DB search