Updated Auto Complete functionality