tags support, improved search