added more indexed fields for searching...