More fixes, this one in particular for Listing of All Engines