MISC - Fetch options action improvements