Added search and some more age parsing granularity