2.5.5 with database search