SOL-20 Adding some code changes suggested during CR and bok choy (WIP)

@martynjames This is for now work in progress. I've covered asset filtering with bok choy and implemented some of the changes we agreed on.