Modified : search layouts for error displaying and ergonomy