+ Fixing some functionality issues (e.g. select relations)