Added the block fetching logic back in, using the module/module_id or returning the defaults.