fixed delete, set limit on search
merger conflicts