Search improved - full text + by ID