Improved search and other additions