Updated code after adding Area search