minor modifications to the content loader