Improved search by albums