Performance tweaks and zap id param for search. Fixes #58