updated structure/ search issue